Merge "Revert "Add support for prebuilt AARs."" into lmp-mr1-ub-dev