Merge "Introduce a no-perfprofd module." am: 742a1bc8db am: 63b23344d2
am: 667bddd995

Change-Id: Ia3b4392788cc099d38077f63a1b4a78b8628dcda