Merge "Use initUnchangeableSystemProperty for initializing os.arch."