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

Change-Id: I15b4288df07fe2f1fb5d0b4f6404708c116149ff