(cherry picked from aom/master commit 11206c60d930be9d29100567aa67f2a65463852a)
Includes renames in a bunch of places not handled by the original
due to differing tree states.
Change-Id: Ic74d9d8850b8c80a51e55e425bbf472a67e2653f
Reconciles the following commits from aom/master to nextgenv2:
- 25aaf40bbc24beeb52de9af7d7624b7d7c6ce9de
- 87073de5693df70eba1c9b9be2b2732ed3b08fb3
Change-Id: Ideda50a6ec75485cb4fa7437c69f4e58d6a2ca73