Merge "Add AID_SECURITY_LOG_WRITER"