Android O MR1 Preview 2 (OPP6.171019.012)
Merge "Mark the module as VNDK or VNDK-SP in Android.bp"