Merge "Fix handling of @removed APIs." into oc-mr1-dev
am: 5cb2d64b9b

Change-Id: I1ac9843cc17efc4ea088e5738c38dcd2ad79e5c5