Merge "Add in enum34 1.1.6 (58c4cd7)" am: 3e42b74ae6
am: b6eac2840d

Change-Id: I8411de7bc6438a9c1f438b769f72bea3ed600843