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

Change-Id: I556cec87362b5beb71ed0583a21aecad4b88e9cc