Merge "locked_region_code_injection: copy jar timestamp to output"
am: 69db849f7c

Change-Id: I14853f14994692c0417f76ecdf85a4567d38f23b