Merge "Remove support for AVB 1.0."