Merge some things from the oppo find5's camerawrapper

Change-Id: I4f320a97baa3af10ac2439460ecaa5d503135726