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

Change-Id: I6c4a6759d492a3db4d3ca3cab76e57333efe1a33