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

Change-Id: I9a1ed4b07d8b9dec3cce32a8b479f18092caf2eb