Replaced some of the bitmap types in ndk.pstypes with the bitmap types that were moved into ndk.datatypes in a prior commit.
Replaced some of the bitmap types in ndk.pstypes with the bitmap types that were moved into ndk.datatypes in a prior commit.

arizvisa/syringe,arizvisa/syringe,arizvisa/syringe,arizvisa/syringe,arizvisa/syringe