Android n mr1 preview 1
Merge "Convert to Android.bp"