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

Change-Id: I4ad5e77c26b12b9da4153823f3f5d9d915cda7d9