Merge "Tell the build system about APCT's requirements."
am: c1d4026341

Change-Id: I98602949a6dc3d3596baa9b5382b6ff25aa9494f