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

Change-Id: I718efd7536331508531bb7c30dfab3638ef60d0e