am af7d2dda: am 5dc7a21c: Merge change I4e036287 into eclair

Merge commit 'af7d2dda809be2ce43b4b892509648857f09f5e3' into eclair-mr2-plus-aosp

* commit 'af7d2dda809be2ce43b4b892509648857f09f5e3':
  update line test to expose some bug on SGX530 ed4
tree: b19d660e7cd0e52fc3d90669169105dfc5201424
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE