Merge "Remove unused cruft from <cutils/bitops.h>."
am: 4c8acafa25

Change-Id: I3c40f329d682da8c2ec89018add35b0a64076f43