Merge "Make __android_log_assert behave more like libc asserts." am: 9df286012c
am: ad2927d744

Change-Id: I174f78fcd9007a6af42046a16d44ac458b7f5bcb