am 5b401f8b: am e245ecdc: Merge "Add LegacyCamera to SDK product" into jb-dev

* commit '5b401f8b8b8d498a87dcfcfc29e00746c794e70d':
  Add LegacyCamera to SDK product