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

Change-Id: Ib066536f33240eda2b7372ade60986d6302cddbc