Merge "Move android.compat.annotation package out of libcore"
am: b4852382fa

Change-Id: I2e28db812bdd35127069b45bfc05c9463772ff88