Merge "Merge "swcodec apex: add a link for libz.so from sphal to platform."...
Merge "Merge "swcodec apex: add a link for libz.so from sphal to platform." into qt-dev am: f5b547b0 am: 787f9170" into qt-r1-dev-plus-aosp
am: 03eebcf5
Change-Id: If64ccf9ade7b51e986931eae090a9cbebffd9a7d