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

Change-Id: I0fe18b8e4a3db3898e8eb65d4f665ae2f5b91c3f