Merge "Update locked_region_code_injection tool to ASM 6.0-BETA." am: 26817938f6
am: e69366ff27

Change-Id: Ieac3aadb7674ec63d4eed3d4d52f833e46d4a3a0