Amazon uses 'AMD' in their java package.
Fix issue where JAVA_HOME wasn't being set until after a complete run. This caused recipes that required Java to subsequently fail.
Merge branch 'master' of github.com:index/java

Conflicts:
	recipes/openjdk.rb