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

Change-Id: I37144068d2d08d7322663042346201824affc4c9