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

Change-Id: I78cdaca76d3fb39e29de94b5a467e72664393e8b