Merge "Separate GraphicsEnv from libui" am: fb5369bc3f
am: 576305e29c

Change-Id: I050d101ae009c98dfb4216cc9bdf49ce8c6a61aa