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

Change-Id: I4e84371d725b8ae6d939f2d5addaf74d1412b968