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

Change-Id: I32ff243e8920dc248cde7c8444f9a67b53ea6478