No love for manta & toroplus YET

Change-Id: I216217f1c891a8d299d974dcca7d2eb5e6cb1cbb
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
Bump version in build.prop as well

Change-Id: I504449c2baa53f3fdff759454098cc3c72f49ca3
Signed-off-by: Gergely Szell <sethyx@gmail.com>
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1