Revert "Actually revert commits."

This reverts commit 65f9767b590006059ad50f2d790221fd8895762d.

The dependent change to add the intellij annotations prebuilt is now
checked in: 7fe0eabdb6b53ba8c85295e77953683b7bc16116 in prebuilts/tools.

Change-Id: I2091eb7f484e570213f6207b6138bf88a1acc5fc
6 files changed