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

Change-Id: Ia45ed3fd0d70cdc6451a38d41d006fa460379a04