Merge "Mark the modules as VNDK in Android.bp" am: 5d1e740e7f
am: 8c03107614

Change-Id: I8b59cbafbd8fd2c5c990da126cc653aaebbe735e