Merge "Remove obsolete code paths from the ARM code generator"
am: 1a22746909

Change-Id: Ie3c9a3e4e56051ae8695a01acdc35f9287736610