Transition to aries machine name.

Requires corresponding kernel change.
Merge remote-tracking branch 'bbelos/jellybean' into jellybean