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

Change-Id: Idd38c34b1f4ee9767dad3861519822fad94da62a