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

Change-Id: I4814a46b548db7e8f851745f3b637f7a8c91f652