Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: 45d1ce0384 am: 77221f5321 am: bc4051cc14  -s ours
am: 2f9cb76a60  -s ours

Change-Id: I586ad207f7d07fdfd715565ab5f21da1701cd1bd