Merge "Properly scope HLoopOptimization's allocator." am: d3a9ce9d30
am: 6f72ae011e

Change-Id: I2dccb5fefa34fe34a567acb662123b62d4b9fab5