Merge branch 'gsoc-dir-split' into gsoc-android-botloader