Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread