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

Change-Id: I20003b781eb402d4cc3420d1d2b20aeca8faf978