Revert "Reconcile android fw w/ cm-11.0"

This reverts commit de907a1b1fdf78051f6f51e7f5a7e5576bc0c750.