Merge "Strip include-raw prefix for script files"