am 5969b408: Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"

* commit '5969b40858d2046aa2b8481926e34c4cb9062a4a':
  Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH