Merge "applypatch: Forward declare struct Value." am: 7a3fc2de8e
am: b7c0ce4201

Change-Id: I9ada801445bf3db83a50c2ef33c37301ea4eae1b