This is Hammerhead, not Mako

Change-Id: Ib0c03fdb2293091b5efa28afacfe102516c9149b
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Merge remote-tracking branch 'slimroms/kk4.4' into kk4.4