Merge "Add a test for external/stlport a6df82320fcb8f26af0d067c7768fedbaeb9ad88."