Merge "Camera2: Clean up some obsolete trampolines left from original API launch"