Fix d2vzw build fingerprint.

Signed-off-by: Chuck Haines <chaines@codemonkeyjava.com>
Merge remote-tracking branch 'upstream/jb-4.2' into jb-4.2