Prepping for new tests that use Android.bp Test: make Merged-In: Ic5722d459e25caa07dac9d58f8bc09e9ea5352b1 Change-Id: Ic5722d459e25caa07dac9d58f8bc09e9ea5352b1 (cherry picked from commit 423c0760)