Merge "Move include in prep of Android.bp support"