[automerger skipped] Remove dependency on dalvik.annotation.compat.VersionCodes am: 8fca45318d am: 8b98694fdd -s ours

am skip reason: Change-Id Ib0632a3eccfed73d66a51afc0ad6aa50c0311501 with SHA-1 1d6554d72d is in history

Change-Id: I07b6e66b1e545ee95cb65aff38cb2d416c68a827