Merge "Remove no-op call to android_update_LD_LIBRARY_PATH"
am: da97c4eee8

* commit 'da97c4eee83d89c577ecc2ba98b2e45a2191b1f4':
  Remove no-op call to android_update_LD_LIBRARY_PATH

Change-Id: I42a9e80b4f0bb5674e89a637ceb54c8d1c03d513