Merge changes from topic 'binder_tests_aosp' am: 8f93ab17f9 am: 1bc063272a
am: 9dada04d4c

Change-Id: I9ddae0943b8a50b90b11bb38f03606780e577a7b