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

Change-Id: Ia8dae571bf897ae125a2eff0412e8ba035b9c6a8