Merge "Remove kDex2OatHostKey from oat-header"