Fix mako build - changes for 4.2.2

PS2: old ion api too

Change-Id: I4e8490f3c9c43392c476498e1436deb43c678fbd
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>