Merge "Include what you use: <cutils/bitops.h> for popcount" am: 48ac45e0e8 am: 8beb417636 am: 2d970888a3 am: 2f13acc6b5

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

Change-Id: I76bfbf1f69d570d20ef1c6b7c1096489b277e468