track upstream frameworks/av

Change-Id: I8283c09239739cade38e80d81835348b05bcb2f2