Merge "Include anonymous enum in ABI dumps" am: d4f7efc0c5 am: bb097ecb70 am: 97b0184850

Change-Id: I9d96d9ca0072b2e1245777037a8e2d123bfdddba