Update volantis workaround to cover L MR0.5 (5.0.2)

BUG: 18725105
Change-Id: I384fde4c9b36c948e995841469b1061da763584d
Merge tag 'android-5.0.2_r1' into HEAD

Android 5.0.2 release 1
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0