Merge "Remove obsolete code paths from the ARM code generator"