Switch gonk-misc branches.

Change-Id: I5a8d9acf6d2f97d2438f62b019c1e12f4729c169