Fix build error && remove ui print
Merge branch 'jb-mr1' of github.com:AndroidCommander/platform_build into jb-mr1