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

Change-Id: I5fc6d2bfafdbe59862d5e572ad439d66b496cbfa