Merge "use libc's powerof2" am: 813a561aed
am: 33972a46d9

Change-Id: If42b958f965260f6364eba38cf944fdb790c8db4