Merge "Mark the modules as VNDK in Android.bp" into oc-mr1-dev
am: 041abda3df

Change-Id: I525a2752e5a69c8e8e4e459310ede39007f18cc0