updating for next weekly
Merge branch 'lollipop' of https://github.com/shorelinedev/aosp_vendor_hammerhead into lollipop