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

Change-Id: Id5971c5ceb68ab3b5a5c72d1655b7a61d8852742