Sync up gles/rc encoders (guest side) am: dd49a0e5b9

Change-Id: I0a23e9587ceecda0c95d81b6c66ad47a6345c17b