hammerhead: switch to my lollipop branch

Change-Id: I6d307a79726db0a83ba3a08eb0d7337bf91551c2
Signed-off-by: Dan Trifan <jimsth@gmail.com>
Merge "hammerhead: switch to my lollipop branch" into L5