Merge "Move include in prep of Android.bp support" am: 367da66255  -s ours
am: a9088231c1  -s ours

Change-Id: I41d53ed9c374766cb4d400d649d3cccdd2878dbf