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

Change-Id: If8a6c0f35ae9ffd323039e6979c1331ad8a1ef7c