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

* commit 'e0a76795125a81471c408d4a23112e98ae2f0ae3':
  Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH