Merge "Use vector<char> instead of char* and malloc() for images"
am: ad13cf96f0

Change-Id: Ifc1f691646b4ee201c889688445096bea9b41d1f