arch/arm except mach-msm: sync from mako lollipop