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

Change-Id: I9556dd5a8bcfe48b3a2ae17aeb407edf81e4f659