Merge "Include anonymous enum in ABI dumps"