trunk-tracking: update to build with mps r3537
Merge pull request #543 from pagespeed/oschaaf-shared-mem-trunk-tracking

trunk-tracking: update to build with mps r3537