Merge "Revert "libutilscallstack is private VNDK-SP""