tree a02e3396fbe7a717db86039bd96da4875c23d4dd
parent f478603db17c8a3a85143697e40091d4355c4903
author Roberto Lublinerman <rluble@google.com> 1487694993 -0800
committer Roberto Lublinerman <rluble@google.com> 1488417216 +0000

Sync back BUILD files changes.

Change-Id: I565738a3ee1544a92485a4fac58c2ffdd09f3366