Fix the build from two breaking changes (update to current.xml and ViewRoot import)

Change-Id: I987b12f7c5fdd4137faa55405fce99bd6f73fc71
2 files changed