am 5e27d10f: (-s ours) am ea9f4a6f: am 12d32fea: am de468a6d: am 63de147f: Merge "DO NOT MERGE: camera: WAR for rounding width" into lmp-mr1-dev * commit '5e27d10f': DO NOT MERGE: camera: WAR for rounding width