merged in aosp hardware since we can on mako
merged in some aosp, some libs from mako, the apps that we are using on mako