Merge "[frameworks][native][opengl] fix -Wimplicit-int-float-conversion" am: 62f8e3510d
am: 4fd60fc0a0

Change-Id: I174a1db33fc0ca0fe88e5c2a127ade048b88124f