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

Change-Id: Idc3ff00540eac3f6755ebbda162db57160753c75