Merge "libbinder_ndk: fix missing "/**" -> "/*"" am: 474b02d29d
am: c695938a5d

Change-Id: Ide4f87321e2e68013c444c554655031616e7c6e4