Merge "Convert libbinderwrapper_test_support to be a static library" am: f5dea8b393
am: 062a372ca7

Change-Id: I3aabdf2d60774be20a675020c4b652a61a4a5deb