Merge "Move libbinderwrapper's headers into libbinderwrapper." am: 4127ccbda5 am: 97dd4017fb
am: 5646010f75

Change-Id: I39bd320c63a8e2c5fdd1f294a6ce49c6fee9e90e