Merge "Rename LOG_ASSERT to ALOG_ASSERT  DO NOT MERGE"