Merge "android.hardware.tests.libbinder static" am: 15afbba38a am: 3adfddb295
am: 64151d5d3c

Change-Id: I347ddfb987c6b220c77b00c1003a8c84214782fe