Merge "Clean the build rules now that the avbtool can compile"