Merge "API Lint: Ignore CallbackInterface in platform" am: c58832221c am: 1d95a273ff
am: f2d84d6f53

Change-Id: I71e9327e931840499475fd314abbf1854dabccc8