Port changes from A14
Description
Port changes from A14 from the android_build repo as the changes were moved to this repo. Below are the reference commits from old repo
android_build@1f0bb7f9
android_build@4a574954
android_build@f95176bc
android_prebuilts_prebuiltapks_lfs@f630148a
Issue
Edited by Mohammed Althaf Thayyil