Fixes for AMI instance-store image build rules.