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

Change-Id: Iab197b5798c8754b5b824a8e6a7663ce7e69ef5f