[automerger skipped] Merge "Revert "Do not mark StkLib as required as it is included through telephony apex."" am: 724c41144f am: b9b40ebc90 -s ours am: 962173f952 -s ours am: a61593148e -s ours
am skip reason: Change-Id I89b4ba6985636effc09bc2788868efba4731f2d1 with SHA-1 00d5ad7278 is in history

Change-Id: I65ec7c8ca8ddee3363728d1df8dbf9ae5f6134a6