Bug 1095801 - Make adb work properly on user builds (Nexus 4/5). r=fabrice