Merge "Generate SHA-1 build ID for host-generated *.oat files (1/2)." am: d82d4252f6
am: 15a53292ca

Change-Id: Ieeaa15f8fc0262ff452ffff865e643524b8e034a