Merge "Add tracepoints for monitoring HWUI's (persistent) ShaderCache" into tm-dev