Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: 2733fdc9de
am: c45b130530

Change-Id: Icf5adda83c30e627db0557d608ee6812318c2ba0