Merge "applypatch: Clean up LoadPartitionContents()." am: c6ee8cf8df am: 9e4ba70b7f
am: c43acc9938

Change-Id: I8d99f72d4d9a7bbed80537ced27f3481ad69ceff