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

Change-Id: Idab5d726027922c66b0ecfe23c3d4f1ea9d2b7a5