Merge "SurfaceFlinger: Set property in StartPropertySetThread during init am:...
Merge "SurfaceFlinger: Set property in StartPropertySetThread during init am: f9b05eeb am: 36c08c7b" into oc-mr1-dev-plus-aosp
am: c2758258
Change-Id: Iddbf9cccbdbd6e945585f57286b2f5e1d320a412