am 1fa662f1: am 4bc3c04f: am 413bb326: am 9fa98ec5: am 8759a70a: am 2b375543: Merge "camera2: Fix makefile for ITS in CTS build." into lmp-sprout-dev

* commit '1fa662f1b5bd57ad20b9b21461609eb9ef9d02b3':