Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Conflicts:
	media/libstagefright/OMXCodec.cpp
	services/camera/libcameraservice/CameraClient.cpp

Change-Id: Id4127fc14e5b73b5a78780f732025f332a2e87e6