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

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

Change-Id: I45ebf104c6a42fa4dc686e2610d30b91d82f4985