They went out of sync some time ago, and are no longer really required since we have them buildable from makefile.unix Change-Id: Ica2dcf5c55f44365598f832f55204d123d7aa601 (cherry picked from commit a4e1cdbbe8)
a4e1cdbbe8