am de468a6d: am 63de147f: Merge "DO NOT MERGE: camera: WAR for rounding width" into lmp-mr1-dev

* commit 'de468a6d602d8cd0034a4e9765cb1162edea483c':
  DO NOT MERGE: camera: WAR for rounding width