whoops, stuff missed to merge
Merge branch 'master' of https://github.com/Android-L-Porting-Team/Hammerhead-L-Rebase