Update common/device test for Android L
Fix common/patch test