Update scene modes for 4.1 tamsui camera blobs

Change-Id: I93aa07f6f7e1cdd54c337f7fd6d68c7d250bb44e
Merge remote-tracking branch 'cyanogen/jellybean' into jellybean