am 38e90751: Merge "Rename LOG_ASSERT to ALOG_ASSERT  DO NOT MERGE"

* commit '38e90751a25606459a9e571aa1b6c992d4c64151':
  Rename LOG_ASSERT to ALOG_ASSERT  DO NOT MERGE