Merge "Disable parts of tuner from user builds" into oc-dev
am: 53ae4dbf8c

Change-Id: I7409558792e77fa16f0e4b95fdf7ae40e59ed1ed