Merge "Remove handcrafted librustc_demangle_static am: 59b25ff22a am: 0bad300d12" into udc-qpr-dev-plus-aosp