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

Change-Id: I3b72e4102c154d8d8e14f3d333371f12a58f68ab