Android 6.0.1 Release 69 (MMB30Y)
am ca1976f4: am 9fbed20c: am 624e743c: am 8dccd379: am 05ff508a: Remove unused variables.

* commit 'ca1976f4a486d48d5e96ac0bfa16560820bea777':