Reconcile with CM

Change-Id: I5d80add824191a379b8510925c442874c43bd68e
Reshuffle stuff. Add back jnimosaic and eglfence?

Change-Id: I2d4838b73c89d7305aa4662b0d01d25cbaa7336e