Merge branch 'lollipop' of https://github.com/AOSPA-legacy/android_build into lollipop