Remove last reference to layoutopt.

Change-Id: Ifdcf35e0bda41fbb5f04515a4b0f1c60dd130d50
2 files changed