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

Change-Id: Ie0fb8fb7fe885d7e09e5b91699afbc234246b2c2