Merge "Generate SHA-1 build ID for host-generated *.oat files (2/2)." am: 5ccc874ba1
am: 53502853b0

Change-Id: Ifacc968933106ee99db51f25ca197772859a7a41