Merge "The script to find a proper build id for system image"