We're using now gerrit.aicp-rom.com

Change-Id: I15cfb6f904eae0be021b6c929f4919932d1654cc
Merge "We're using now gerrit.aicp-rom.com" into jb-mr2