Merge "Include anonymous enum in ABI dumps" am: d4f7efc0c5

Change-Id: I8792c0e040f731e9fb2524dd2a1e0677a1bd4aba