Add tilapia

Change-Id: Icac262f2ddd50ccdc55add7e72a2f1388768c237
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
Merge remote-tracking branch 'AOKP/jb-mr1' into HEAD