am ca849386: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'ca84938689028a7c5f5747d81b81cfc6a6c1b382':
am 9983e817: am ca849386: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9983e817b20980afd321739d80f99164a6b79bb0':
am 9942cb83: am 9983e817: am ca849386: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9942cb83c438238e5b486b20c07c166c727b00c6':
am be482d96: (-s ours) am 9942cb83: am 9983e817: am ca849386: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'be482d966527bf6894e23533afbe7d586c7f0f34':
ccache: update to 3.1.9

Change-Id: I131dbf5272907b88ab149e122283cf195f4ca34c
Merge branch 'cm-10.2' of https://github.com/Mustaavalkosta/android_prebuilts_misc into cm-10.2