Merge "Remove no-op call to android_update_LD_LIBRARY_PATH" into nyc-dev