Merge "Update emulator 4.4 kernel to 5290615" am: 2837eb342d
am: 264a20bb34

Change-Id: If0bc76361e5fb7febae0b7c607c796f8ba05533a