Mako, the lost child

Do we really need the seperate repo to build?
Anyways, some updates, I want to work on this over the week/weekend so we can have the full house of nexi (nexuses?)

Change-Id: Ia8572c072ff2553e113d7ae074bb579adf414a34
Merge "Mako, the lost child" into jb42