Merge "update 3.4 kernel, ARM"