Merge "Link PlatformProperties statically" am: e6dfbe59c7 am: c39b19776b am: 32588593fe

Change-Id: I4820e851c3a948f49ee210260b0c4cbabbb47dee