Merge "Remove SurfaceFlingerProperties.jar" into rvc-dev