Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: cc10db2c9e am: 314e645a2a
am: d16cf94146  -s ours

Change-Id: Ifaf960be8d749811f3a366d3b9145f305be9a12c