More changes to Shooter

Change-Id: Ic4cc947c3d8a684541d9884598ce0acaa90f1297
Merge branch 'cm-10.1' of https://github.com/cmartinbaughman/android_vendor_pac into cm-10.1