Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: d037324f2f
am: 869b7d8bf9

Change-Id: Icf6e23e192afb7e6d1ea36539376f8a1a4b8ed71