am b6114c7b: am 7cb797f1: Merge "emulator: opengl: use bilinear filtering"

* commit 'b6114c7b66744729b8e0e9142e8b07eba41637d5':
  emulator: opengl: use bilinear filtering