Merge "gralloc: Back out hacks now that Mali-derping is fixed" into mr1-staging