Merge "Import macros via rdroidtest for consistency." into main