Merge "Fix boost build with unified headers."
am: 498b4de964

Change-Id: I5cd210231b3c254e272ad0db5d77f02dad5466b9