nicki: Bring back local setup-makefile

 - local setup-makefile was removed in commit 98626c18bbc40b0b8abe016b1c6b09351317d318
 - declare libtime_genoff as prebuilt.

Change-Id: I2d8a580a4153228193decfbb75485e46b6c83d36
nicki: Fix for CTS CamcorderProfileTest

 - Nicki front camera can't go beyond VGA
 - Remove wvga for FFC from media_profiles
 - Add fake 480p

Change-Id: I0a0b98bee1123808ce42a4151f679c53bd362e0c
nicki: Enable volume rocker wake option

Change-Id: I2416738e2d4b4ccc4b334b4e838cb13778e23710
nicki: Add Widevine blobs

Change-Id: I4aa1ead53d613b2d25bcbd00063051a10b35c328
script: fix traditional sort

Change-Id: I499e4c258042da9f2c20d9b95177ef97c461bdfc
Inherit from msm8960-common

* msm8960-common then inherits from qcom-common.
* This doesn't change anything currently, just adds one more
  common tree in between - however, later on, we can start moving
  things to this new tree as needed, from both nicki
  and qcom-common

Change-Id: Ib0a5bca4569501e8504ae18b04c98f59130fe4be
script: make osx devs happy

Change-Id: Ib58b678816dfb9b2dba85df0ffe3811d60fe7151
Merge pull request #4 from CyanogenMod/cm-11.0

Merge Upstream