Merge "Mark the modules as VNDK in Android.bp"