Merge "Delete @removed APIs that never shipped."