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

Change-Id: If8113607aec145f8d41f51494a9707f994f73bf2