am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as...
am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev
* commit '6e21817b':
Revert "Camera: Add new capability flags as system features as well"