Switch branch for frameworks_av