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

Change-Id: I85ff433e12feb56febe8eeba5e61ce6c45585148