Merge "Build libstaticsharednativelibprovider against the SDK."