switch to upstream style HAL branches

Change-Id: I8b433f416e0bc9e2262a3e008514f98e6229b584