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

Change-Id: Id7f65ecfcd8a660e722740a15fd5280ae86371eb