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

Change-Id: Idfd0473df234aa7de0c6e25115d4d78dcf631431