Merge "Use ASM6 Opcodes everywhere in locked_region_code_injection"
am: 5aa4dafa58

Change-Id: Ic8f892399cdfa746a2fab4a841469f41f0fe98f5