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

Change-Id: I1f8d0f1bcd0a0b9fffb9e870acebebc23a85d6a1