Merge changes from topic "rename_llvm_libs_set2" am: b8566dc49e
am: 5eef964975

Change-Id: I09949eadacdc5d63f96ecf84fb13be43d553b4b3