Merge "binder: fix inconsistent-missing-override warning." am: ab0b2a284e am: 5f9520d6a6

Change-Id: Icb1b3a251e5361a5d36fd26974286d6c24039bb1