Merge changes I12810c1b,I62287a80,Ied96fdc3

* changes:
  Remove LOCAL_ACP_UNAVAILABLE
  Remove unused dependencies on $(ACP)
  Replace some uses of acp with cp