Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: 7f07df8aaf am: af922be502
am: 8e87f8390b  -s ours

Change-Id: I37d5c9220fae4dc9bd0628b7fc662618e7b1eb19