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

Change-Id: If22e85e39707b65b33571d2ce42d0fb84c4ac518