Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: 0902bb9d09
am: abfcefeeb8

Change-Id: Ib69e43a740cf54ea094365737320702ddea7963a