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

Change-Id: I30f21ca84eeac9d697ee439362258ecf0ec0202e