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

Change-Id: Ic090f087299a04d6760ee6cc83b2f3bc15e6ed13