Merge "Remove reference to compatibility layer"
authorJohann <johannkoenig@google.com>
Tue, 12 May 2015 18:44:24 +0000 (18:44 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 12 May 2015 18:44:24 +0000 (18:44 +0000)

Trivial merge