Merge "Keep emma files for host rules" am: c79c95d
am: 7aec87a

* commit '7aec87ad1e9b7915fdd91fde671aaf5916f68f08':
  Keep emma files for host rules

Change-Id: Iae8e4d51d0f8c6ec61d5444486cd206803d693a0