Merge "Perfprofd: Enable some more warnings" am: 3e4cd931cc am: 3164f297fc
am: 38239466c2

Change-Id: I9d15c30097de6994d0d15adcaab4d950988d7444