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

Change-Id: I344dadf955dcd5d8acb0b792b5837f1e3cf5bc4c