Merge "Finish moving away from LD_LIBRARY_PATH on Android."