Merge "Add room-compiler dependency on jetbrains-annotations" am: e34212fb2e
am: b52ad2a330

Change-Id: I59911cf6b57db0a52de238e40add59432b16b342