Merge "Perfprofd: Enable some more warnings"
am: 3e4cd931cc

Change-Id: Ib38b0cd9d61f9834bbece8ad5be49ffa9beac051