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

Change-Id: I8280267ca048d8941580ba340385d168f2a7d23d