Update volantis workaround to cover L mr0.1

BUG: 18412138

Change-Id: If713c5fb10c2d7317c08f1d85249f621161ed982
Merge tag 'android-5.0.1_r1' into HEAD

Android 5.0.1 release 1