Oh Google... this is AOSP

Change-Id: I7d25fbef9dcbb892b6840af1538a6395857f9d28
Make Camera shutter follow device sound setting

Change-Id: Ia8eca52f9be94abef6c386545991f9ebe0855bb7
Merge remote-tracking branch 'xy/jellybean' into franco