Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev