am c5152705: Merge "Libcore: Allow "os.arch" system property to be changed"

* commit 'c5152705f26bc21f27d09107c645f47e730e8762':
  Libcore: Allow "os.arch" system property to be changed