[automerger skipped] Remove dependency on dalvik.annotation.compat.VersionCodes am: 8fca4531 am: 8b98694f -s ours am: 5121dd13 -s ours
am skip reason: Change-Id Ib0632a3eccfed73d66a51afc0ad6aa50c0311501 with SHA-1 1d6554d7 is in history
Change-Id: I942e5ea61a56279f1e312fec777884e8cd29af38