Merge "Add support for dalvik.annotation.compat.UnsupportedApiUsage"