Merge "Camera2Basic, Camera2Video: Catch up with the API changes." into lmp-dev