Merge "Opt libhwui out of -fprofile-sample-accurate"