Merge changes from topic 'binder_tests_aosp'
am: 8f93ab17f9

Change-Id: Ic70202c57f5568cc8dbcfd65d8514c7754b0b8ae