Patches
Plain Diff
Add updates from Ittiam and Marco. Bug: aomedia:3281 Change-Id: I5b2ec54744f20a3fc967000466a29498254d9dba