Merge "camera2: Fix makefile for ITS in CTS build (take 2)." into lmp-sprout-dev