Merge "Don't bundle compat framework annotations"