reconcile hwui libs w/ cm-11.0

Change-Id: I2b5ea3a24106d57d9375dcc1e52c09d04f03b254