Switch back to b2g/ics_strawberry branch

Change-Id: I0e88af707f0fce0d2071d25c142aab21618cdcf8