Merge "Allow disabling GL preload even if gfxdriver isn't updatable"
am: 9cf8c281d2

Change-Id: I025787589009c11bd5477777105b2a5ab2c5f592