DO NOT MERGE ANYWHERE Revert "Fix build breakage by removing ad2p impl." am: 274c653dc5  -s ours
am: 8c83be4afb  -s ours

Change-Id: Id02a416d7069ad283e30dd5833b9b7c1e34218fb