Android 8.0.0 Release 35 (OPR4.170623.020)
MainLoop: improve error handling am: fd59221459 am: 8fbb6736ff am: 02b8923766
am: 0568dbda87

Change-Id: Ie76fc927106cbbc692249ca67ddd19a6511016f7