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

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

Change-Id: Iee4973fcf6cba7a368f314aa8978b306678d0247