Merge "Remove no-op call to android_update_LD_LIBRARY_PATH" into nyc-dev
am: 05f221c84b

* commit '05f221c84b02580838b980b3605a25ce4e54cee0':
  Remove no-op call to android_update_LD_LIBRARY_PATH

Change-Id: I7c3b6f9213878bfffaf43156480740baa18e8625