Merge "Mark the module as VNDK or VNDK-SP in Android.bp" into oc-mr1-dev
am: 79afc4e4fa

Change-Id: Ifadf371219410692aaa5839ad452fa74acaccf79