Merge "Remove old hack" am: ae0d3ee4ce

Original change: https://android-review.googlesource.com/c/platform/tools/metalava/+/2037129

Change-Id: I5976291c1fb19ae30fbdee6b01ccf909ee678a65