Merge "Make ImageWriter and PatchOat helper classes nested."
am: 965a21e284

Change-Id: Icf09afb796f18054d8d9f11af4b0903c0b96c9ff