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