Revert "Updated VFP to max from 3.4.Y Google Android."

This reverts commit 2132fc62c44b86b0d0d619f8bb75a5714f6a2c61.