Merge "libbinder_ndk: formatting" am: 50576118cd
am: b56737d4c0

Change-Id: I0d2e24473687c11c360cf126dd9e82796e696c46