Reconcile android fw w/ cm-11.0

Change-Id: I83701773a3ef38212e422fa64dbc7f882a9cacea