Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: 72ec97a2 am: 301705c3 am: ee12d995 -s ours am: 3c7cbe58 -s ours Change-Id: Ifd51ee9fbce0095e4c137b9f1d87cb5ca4367a43