Discovered by the upcoming compiler update. Test: m checkbuild Change-Id: I8dd4bb711bfa4f4b71a3345a2ee38f689cee5257
796987482
bb5ec4a926