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

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

Change-Id: I6f91d71dd73f7bf52384d9fed60e4237306b8db2