Merge "Generate SHA-1 build ID for host-generated *.oat files (2/2)."