Correct merge calculation error in layout.yaml

When change I74e0bda10e85fbe430238f9b53d53b3671309a6a was merged
into master via merge commit
889190486928acf663b1ac616b442d56fcb7f110 it was applied incorrectly.
Its context should have conflicted with an earlier change two lines
away, now corrected here.

Change-Id: I111895676b4376430c1730631f3eb96866991cd4
Merge "Correct merge calculation error in layout.yaml"