Merge "Move dalvik.system.VersionCodes to dalvik.annotation.compat"
am: 6aa7534178

Change-Id: I05ffe436b0ca75833569c06ead7e789415a28a60