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

Change-Id: Ifd51ee9fbce0095e4c137b9f1d87cb5ca4367a43