Merge "Remove unused cruft from <cutils/bitops.h>."