Merge "CE: Build with ATRACE_TAG=ATRACE_TAG_GRAPHICS"