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

Change-Id: I313ddcb7532f66e787f8c517f75849ca1542259d