a6f6a13385
Also, continue support for old bitcode library layout for backwards compatibility. Change-Id: Id7f164ecb989a44c22958afce78745552a4babb3