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

Change-Id: I156e9ddd802eb6aa3b67bc9b2d5a98753f899e74