Revert "Camera2: missing AOSP translation"

This reverts commit 0d1e4d7e07820aa232cc1542441d052d2e38e904.