Merge changes from topic "rename_llvm_libs_set2"
am: b8566dc49e

Change-Id: Iee89b6007fe0fd012baaa318cf35859279e5c068