Merge "libbinder_ndk: forgotten formatting." am: 99e7f66c8a am: 7df7a0501c
am: 6f96b76aec

Change-Id: I7644866afd26d3a37e79c32fe1bef6393f81cf51