add Android changes from FIPS 1.2.2 module