Merge "GM8: remove until device tree can be fixed."