Merge "Remove dependency on dalvik.annotation.compat.VersionCodes"