Merge "Move android.compat.annotation package out of libcore"