Merge "Refactoring LSE/LSA: introduce heap location type"
am: e57a82bd25

Change-Id: I1d00a3846d3184acf9aaa6934ce5f93c5059f928