Merge "Make StkLib visible to telephony apex + platform" am: 1e61a4c2a2 am: 4ed913d676 am: 6e98d7486b

Change-Id: Ie3df3cf9ad7ff4d2d6fcfe2237b236b857b43b27