Add .gitignore
Use unified layout for both Sony and AOSP
Version bump
Re-enable replacement layout on Sony