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

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

Change-Id: I36077d8b84a3a8fe959c18d8f5e516e03303e3f6