Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"