mGerrit 2/2

Part 1/2 in manifest
Inspired by post ok AOKP, they had wrong location so did not CP it

ps2: fix escaped newline

Change-Id: I6c7903a7218d89310ee746a2497711546c61049a