am 08d60ceb: Merge "Use LOCAL_MODULE_RELATIVE_PATH to fix multilib build warning."

* commit '08d60cebfe0527a310a5cf8e737cc298871f8025':
  Use LOCAL_MODULE_RELATIVE_PATH to fix multilib build warning.