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

Change-Id: Id84458418c43161aa6fa086eb54f29ff84d51c51