Merge "Add back keymaster@4.0 hash." into stage-aosp-master