Makefile and doc cleanup.

Change-Id: I035359ad868efc14d6ed066c54262e3411bde35b