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

Change-Id: I0425ac9acd4dcdf03a39472ab18e9705aeb665d8