Really libportable should take its own copy of BSD's <machine/asm.h>, rather than relying on bionic's hacked-about copies. Change-Id: I02248045a903dc4ca0d6ed1054ecb1cd54da335e