Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: b85e45fc3c am: 350c8052da am: 812d23c128  -s ours
am: 12d86e2fe2  -s ours

Change-Id: I87020729e4eb680fd2d45663475877eed1fdd113