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

Change-Id: I6f3b9c6366a8c7423eb3120e2dcc9db083187ab1