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

Change-Id: I2f9ab3eca495cc5c1c4224bdbc2ff9479ee07197