Android m preview
am ad31d24b: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."

* commit 'ad31d24be15c7a24c03e92f6d6257f3e19aa03f2':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.