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

Change-Id: Ia10736bb3e6eac5e47b02b8a2491c367874759e3