5.0 upgrades

This is now ready for 5.0.... I think. Waiting on the nexus 6 to fully
test. ALso full clean builds after ugrading play services and support
v4_21