Merge "Include what you use: <cutils/bitops.h> for popcount" am: 644015b732 am: b9379f26d3 am: 866d56789c am: 4cf80ec611 am: 2cc10f4dac

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353065

Change-Id: If6c60f55992fa3fe60b810fc2cc524a617bc0297