Build toybox diff. am: 98aae74f4a am: 9fb8ea3215
am: 62a69f78fb

Change-Id: I841ff3e0439302fd50f6d4851546112acef84c30