Merge "Added libsensorservice_headers and support for static library"