Fix build system for rebase.

Change-Id: I3536efafeefdae9c2f669b1245fa38df4bd01590
2 files changed