Merge "Allow disabling GL preload even if gfxdriver isn't updatable" into oc-dev am: 8cafe5d9b4
am: e20f42b8a9

Change-Id: I5d7df6e69e0f3c1688873cff747d62e5ddd1f78d