Merge "Apilint: No longer flag interface callbacks" am: 26968d81f8
am: 834803b3e2

Change-Id: Ib1825b1e190df752e901424a89e30b78261f4c82