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

Change-Id: Ic33dffeeac6445773de09ec9c1cb4bc3b79ae5ea