Merge "Upgrade 3.4 arm kernel image to e284ae2"