Change M8 build.

Change-Id: Iee2780395667c277a51a43fb7240af1dc3bfc4bf