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

Change-Id: I828fd965862f2bf4ac3642877a40bafaa99e9b18