Fix build/dependency issue.

bug 10427951

Change-Id: I798a0014f299b22c26bea3205823fcbb64f7ec70
6 files changed