camerawrapper: more merges from oppo5's repo

Change-Id: I699519e10116d240a5a159277a5c2fe397221c1d