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

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

Change-Id: I8023ab6733ef32c125620393cf4b8fba585e2f16