Merge "Preparing for build system change. Fix the build error in http://b/issue?id=2781522."