Merge "Include what you use: <cutils/bitops.h> for popcount" am: a4d629d311 am: e9458106aa

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1354145

Change-Id: I1613f16bdb589ab57f6d687578b0af9cbc7c664b