Merge "Revert "libutilscallstack is private VNDK-SP"" into pi-dev