Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: 72ec97a21e am: 301705c36a
am: ee12d99597  -s ours

Change-Id: Id09f102da61cd0d261e449fc71406a0cbf01682e