Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: b85e45fc3c
am: 350c8052da

Change-Id: I3483a186b9781a4696534976f3890980b86edaab