am 2124b521: am c6083626: Merge "Use initUnchangeableSystemProperty for initializing os.arch."

* commit '2124b521e86ee778880eb42cd40c5820d625890e':
  Use initUnchangeableSystemProperty for initializing os.arch.