Track aosp branch for Camera2

Change-Id: If31913b81055fb0bedf78de8308f2aa331464745