Merge remote-tracking branch 'Upstream/kk4.4' into Oppo

Conflicts:
	config/common.mk
Merge remote-tracking branch 'origin/kk4.4' into Oppo

Conflicts:
	config/common.mk
Build Update
Merge remote-tracking branch 'Upstream/kk4.4' into Oppo
Merge remote-tracking branch 'origin/kk4.4' into Oppo

Conflicts:
	config/common.mk
Build Update
Update common.mk
Camera
Camera App
Add APK & Boot
clean up
Merge remote-tracking branch 'origin/Oppo' into kk4.4

Conflicts:
	config/common.mk