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

Change-Id: Iffc0701e60aa832e994d92b0ff426640a9555847