ref: f3904a9b96cac690afb3f7235d41f0c849fbfbaf
parent: 33df6acb2bc755f7c90b478deafda78386696fd1
parent: 26ed1ed4f0e621c178a1dd93de07a0431499ebe4
author: Wan-Teh Chang <wtc@google.com>
date: Thu Jul 12 21:40:35 EDT 2018
Merge "Backport libaom bug fixes."