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

Change-Id: I8852c0c426680f94035a6f8ab6b7d72e8c0dd13d