Track own mako and flo kernels

Change-Id: I730d762207def00b4f3dcf2da024d371e29984e2
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge remote-tracking branch 'upstream/jb-mr2' into jb-mr2