am 48a96f51: Set os.arch property from uname().machine.

Merge commit '48a96f5133f33adaadbc0187503a35f03f1348ac'

* commit '48a96f5133f33adaadbc0187503a35f03f1348ac':
  Set os.arch property from uname().machine.