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

Change-Id: I0552860593d63bf49d322b93a163a21368081cfb