am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread

* commit '919853ce244f853966817d4adb2f3b7b6e4bbe74':
  Prevent SurfaceFlinger from using layer token 31.