am 958d241f: am 6613e27d: Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"

* commit '958d241f1f10523da56e018772acd3c2441a9701':