Merge "libbinder: defork internal Android.bp"