Merge "SDK Manager app: use src/{main,test}/java pattern."