Merge "Mark the module as VNDK or VNDK-SP in Android.bp" into oc-mr1-dev am: 9e1e7e1a93
am: 7521d8590b

Change-Id: I1c35487635444914544d758f8925a6b125646c48