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

Change-Id: I30e4e3fa53829a3b02a5abbd6a6b17d3e4822813