Fix build rules.
am: 917cfdb915

Change-Id: Icc6f4893575582002b1b8776d1e5ffe89e8a3ea5