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

Change-Id: I4e4d6beaf715c2d9d30c39ebdda94cd2118e28af