Updating to compile for released 5.0 Lollipop.

Fixing compile issues with released Lollipop.