Update to final Lollipop Release

Updated code and xml attributes to reflect latest Lollipop changes