Merge "Remove references to " am: a71ec6419d
am: 8591eb4794

* commit '8591eb4794d61553857d613e74f4b58db9daf3ba':
  Remove references to $(ACP)