Merge "Move annotations in public api to frameworks/base"