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

Change-Id: Ic425066feb4288c37154d8b0c487aeda93a6ac59