Fix aws-java-sdk version and sync with latest build template