add back tilapia

Change-Id: I495eefb61eb071dea2b6d1f88f00b0d9510d91f3
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge remote-tracking branch 'aokp/kitkat' into kitkat