Merge "Updated to use shared library instead of static library." into main