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

Change-Id: I89c9bb94c42a4f0809ada71799718edba4f2b73a