Merge "libbinder_ndk: @file, @addtogroup" am: 1bf41031e7 am: 6ab7cc4115
am: d2ee67c56c

Change-Id: I80b26f25b5b8e94fd05e3db24b79a8d36936cc86