Merge "Add support for dalvik.annotation.compat.UnsupportedApiUsage"
am: f4fd65e393

Change-Id: I9f7f006b97be0a9057e131b15251785d1babcc6e