mako: track torch & local qcom-display

Change-Id: Iffd038f0c9de7f0d09427c5e32e2b180643a9c7f
VenderProps: Nexus 7's

Change-Id: Ia803643a8af8b63a3679cf07aa7f36eb9fcf64fd
Merge branch 'jb43' of github.com:ParanoidAndroid/android_vendor_pa into jb43
Merge remote-tracking branch 'upstream/jb43' into jb43-alt