[automerger skipped] Merge "Add room-compiler dependency on jetbrains-annotations" am: e34212fb2e am: b52ad2a330
am: 1524d93c51 -s ours
am skip reason: SHA1 1524d93c51 skipped by user zachoverflow

Change-Id: I4312a5e08f16527ad2e8d070c6033f5f476859fc