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

Change-Id: I9780a459aafe811b7ca2fbb839f4682278426d02