Merge "Merge "Mark libbinder as VNDK in Android.bp" am: 920514db am: 203cee15 am: 3fd83afc" into oc-dr1-dev-plus-aosp