Merge "Move perfprofd installation to PRODUCT_PACKAGES_DEBUG" am: 47bfd3422f
am: f22e056df6

Change-Id: Ib7166b8ababdd1c93422e5284a1ba3cc8397480f