Merge "Link PlatformProperties statically"
am: e6dfbe59c7

Change-Id: I9cc00e90f30badfe48a83234b227f04ed2b9c3b4