Merge "Revert "Let classloader provide correct LD_LIBRARY_PATH"" into mnc-dev-plus-aosp