Added features from AndroidArmv6 repo