更改目录结构
Merge remote-tracking branch 'choose_remote_name/master'
Change-Id: Icd7c0cbec44ea1b107573e71c5cc3c5344738d89