Merge "Perfprofd: Add option dump"
am: d4e3b2199b

Change-Id: Icda6762aa4551ce1fb3038ffa2e0905d701780d5