Aosp 5.0

Ugh, there is no 5.0 branch yet.....

Will this PR create a whole new branch 'aosp-5.0'? I think it wants to merge it all into omni-4.4. I screwed this up. I'll close and try again.