Fixed build errors in unit_tests and content_shell_apk