Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: a80c5de7e9 am: d447843f80 am: e010ad7b4b  -s ours
am: 72c176484b  -s ours

Change-Id: Iba5676f7c5476961954da23d9def86e1ed75165c