ec2-build/build-kernel: clean up directory handling and 3.2 branch