Android 5.1.1 release 3
am 504ee5cc: Merge "external/neven shouldn\'t depend on android_runtime."

* commit '504ee5ccaabd8bce4da3430b0f4e9714ac2a8e6c':
  external/neven shouldn't depend on android_runtime.