Merge "Give unique name to host build shared libraries" into jb-mr2-dev-plus-aosp