Revert "Use android-msm-mako-3.4-kitkat-mr2"

This reverts commit 048b90b8d3e9f9151445231a34cae754cdaf1365.
Revert "Use mako's android-4.4.4_r2"

This reverts commit c19271fea4b2144c92c7c12dac10cbc0b419cbb6.