Change-Id: Ie3e5b7fb88caf2a795fccdcf214f559f9683070c
Also, include it in 'make dist' tarballs. Change-Id: Ia28743b7ea3510097f841f83d2eca2669b4d73ea