Add Nexus 4 and JB emulator build support
Merge remote-tracking branch 'upstream/master'