Merge changes from topic "libgraphicsenv"
am: 943675342e  -s ours

Change-Id: I200f4edf0d49555e77091d8c3ad27352d8f7e18b