Port 2d858519

Original Commit Message:

    There's no need for this code to be completely architecture specific.

R=jupvfranco@google.com, joransiu@ca.ibm.com, jyan@ca.ibm.com, michael_dawson@ca.ibm.com
BUG=
LOG=N

Change-Id: I33d4eaff8309e6684cf9ab003f57aeac15e4a56e
Reviewed-on: https://chromium-review.googlesource.com/626318Reviewed-by: Junliang Yan <jyan@ca.ibm.com>
Commit-Queue: Jaideep Bajwa <bjaideep@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#47517}