Fix build rules. am: 917cfdb915
am: 3b85c58a96

Change-Id: I989556419546dff66ffccce53d4f863ffb39f610