Merge "Allow HDeoptimize to co-exist with LSE."
am: 8acdebc1a1

Change-Id: I3381e4f6b35efe4b183d9cc543ba64ae61ad625e