BUG=aomedia:620 This reverts commit 4da880bd. Change-Id: I40a2295083b3328ef743d3eab9c2aa514dc698eb
Attach a file by drag & drop or click to upload
