Merge "Upstream changes from hardware/google/av"