Merge "native_loader: Use ANDROID_ROOT environment variable"
am: 6d28ae7

* commit '6d28ae7b0dfb486b3d7840185cdcbde5aec76a04':
  native_loader: Use ANDROID_ROOT environment variable

Change-Id: I1cda059bc87629f52077a33d18b2f8cdc4707dd2