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

Change-Id: Id84d48eab239f3fc4b102d86deb232793f937104