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

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