Merge branch 'L' of github.com:SimpleAOSP-Lollipop/platform_frameworks_base into L