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

Change-Id: Idf85a6e2c0763a35a147df3b8e08d35e94a80827