Merge "Deprecate Looper.prepareMainLooper" am: b1f69203e7
am: 8292d73554

Change-Id: If6337140dff6edca87030b2d747ac1393f963957