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

Change-Id: I8ce6b43789f60dc098affebceddb395af6892bc4