Merge "Make image oat checksum depend on secondary images." am: 31c6ea5711
am: 859608a281

Change-Id: I3fef5a6636c0f5c730d7af3e1bbf2e4e88799884