Merge "Mark the module as VNDK or VNDK-SP in Android.bp"
am: 2733fdc9de

Change-Id: I6d3e99d26da5b4d65c23fdf2d318962425d3ea90