Merge "Mark libbinder as VNDK in Android.bp"