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

* commit '4bc3c04fc37ee1c16c5608a72f8a2e77a1749e21':