development: Update Calculator libs

Change-Id: If762e4b02f133c7e41c413e22cacb04e0552b416
Merge "development: Update Calculator libs" into cm-11.0
Merge branch 'cm-11.0' into kk_mkt