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

* commit '5831a369566fa6a72cac8f4eda8206a6d79eb5c8':