Merge branch 'donut' of git://android.git.kernel.org/platform/development into HEAD