Follow my frameworks/av repo

Change-Id: Ib31a03899ed579ec0b91ad080c1708292bde393e