automerge: 42e620e * commit '42e620e5cfae56ded772d9e95d06e05f08d1b75d': Add Nexus 6 and Nexus 9 to the device framer.