am 207cf549: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '207cf549':
  Whtelist for ug   b/9106968 	modified:   permission/src/android/permission/cts/FileSystemPermissionTest.java
  Add GFX char devi to the whitelist 	modified:   permission/src/android/permission/cts/FileSystemPermissionTest.java
  increase margin to 30%
  change testLoop to create its own Looper in a separate thread
  Bail out early in case of error
  Fix coordinate count
  add polling check to GridViewTest
  add polling check for focus / dialog
  Fix check for current EGL context
  lessen fail criteria for openglperf
  camera tests: handle configurationChanges for orientation ourselves