Android 7.0.0 release 6
am b8f9b742: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."

* commit 'b8f9b7428a741c3b1fc1667a4fa80931bcfe224b':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.